Skip to content

Feat: Wire the fork's window parity logic into the renderer (stacked on #165) - #175

Merged
b-re-w merged 4 commits into
developfrom
feat/window-compose-wiring
Oct 5, 2026
Merged

b-re-w merged 4 commits into
developfrom
feat/window-compose-wiring

Conversation

@b-re-w

@b-re-w b-re-w commented Oct 4, 2026

Copy link
Copy Markdown
Member

Stacked on #165 (base feat/fork-window-integration). Do not merge before #165.

The window code moved to the fork. The Compose half of what #147 and #155 added was on neither develop nor #165, so this carries it.

Wired: contentMinimum, DockIcon (with toNSImage), SystemDarkMonitor and the fork's clipboard on the Kotlin/Native macOS renderer; the same on the GraalVM macOS window plus NativeWindowOptions and the synthetic exit. Brought over: the portable LatencyTrace and SyntheticInput, JvmCompatShims, ParityMeasurementTest, the hand-check app.

Not here: NativeWindowShell, Win32 letter and digit keys and the default-window switches depend on #134 (also #160, #170, #172) and come with it. The GraalVM text menu needs the fork's setTextMenu (local fork branch feat/graalvm-macos-text-menu, not pushed yet) and a pin bump. The Kotlin/Native resize header counter is dropped: the fork's FramePresentLog replaces it. The scripts/parity scripts stay in compose-rust and are still on #155's branch.

Not built locally (no builds by rule); CI is the check.

b-re-w added 2 commits October 5, 2026 03:40
… over the parity harness

Stacked on #165. The window code is the fork's now; the Compose half of what #147 and #155 added
is not, and was on neither develop nor #165.

- macOS Kotlin/Native: contentMinimum, DockIcon (with ImageBitmap.toNSImage), SystemDarkMonitor
  fed by the appearance notification, and the fork's MacosClipboard and MacosClipboardManager,
  so Paste is offered by what the pasteboard holds.
- GraalVM macOS: the same DockIcon, contentMinimum and a polled SystemDarkMonitor, the
  clipboard through TextPasteboard, window options read once by NativeWindowOptions, and the
  synthetic exit.
- The K/N-portable LatencyTrace and SyntheticInput (no String.format, System.nanoTime shim,
  exit after the resize), the JvmCompatShims they need, and ParityMeasurementTest.
- The hand-check app and its consumer fixture changes.

Not here, with reasons: NativeWindowShell, the Win32 letter and digit keys and the default
window switches depend on #134 (beginNativeWindowDrag, win32ComposeKey, the X11 and Win32
defaults, also #160, #170, #172) and come with it. The GraalVM text menu needs the fork's
setTextMenu, which is not in the pinned fork commit yet. The resize header counter on
Kotlin/Native is dropped: the fork's FramePresentLog replaces it.

Covers FR-33.6 (clipboard and text menu enablement), FR-19 (min size, Dock icon), NFR-14.
… branch

They read the numbers LatencyTrace and the resize accounting print, so they stay with the
renderer harness rather than going to the fork. Same content as on the #155 branch.
@b-re-w
b-re-w deleted the branch develop October 5, 2026 03:37
@b-re-w b-re-w closed this Oct 5, 2026
@b-re-w b-re-w reopened this Oct 5, 2026
@b-re-w
b-re-w changed the base branch from feat/fork-window-integration to develop October 5, 2026 03:38
b-re-w added 2 commits October 5, 2026 12:42
…e-wiring

# Conflicts:
#	renderer/desktop/src/AppKitWindow.kt
#	renderer/desktop/src/NativeClipboard.kt
#	renderer/macos/src/MacosRenderer.kt
…after the develop merge

NativeWindowShell.kt on develop already declares NativeWindowOptions and nativeWindowOptions,
so the branch's copy redeclared them. The X11 window is the default on develop, which
linux-window-default.test.sh enforces.
@b-re-w
b-re-w merged commit 923b7e8 into develop Oct 5, 2026
15 checks passed
@b-re-w
b-re-w deleted the feat/window-compose-wiring branch October 5, 2026 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant